ddl: migrate test-infra to testify for serial_test.go #30630

wangggong · 2021-12-10T13:45:19Z

What problem does this PR solve?

Issue Number: close #29113

Problem Summary:

What is changed and how it works?

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No code

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

None

ti-chi-bot · 2021-12-10T13:45:21Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

hawkingrei
tisonkun

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

wangggong · 2021-12-10T13:47:21Z

@tisonkun PTAL

PS: for TestRecoverTableByJobIDFail & TestRecoverTableByTableNameFail, test with add hook may cause failure. Then it is temporarily commented, and maybe I need some help to deal with it.

ddl/db_integration_test.go

ddl/serial_test.go

ddl/db_test.go

hawkingrei · 2021-12-11T14:44:26Z

ddl/serial_test.go

@@ -215,23 +215,23 @@ func TestCreateTableWithLikeAtTemporaryMode(t *testing.T) {
 	// Test create temporary table like.
 	// Test auto_random.
 	tk.MustExec("drop table if exists auto_random_table")
-	_, err = tk.Exec("create table auto_random_table (a bigint primary key auto_random(3), b varchar(255));")
+	tk.Exec("create table auto_random_table (a bigint primary key auto_random(3), b varchar(255));")


tk.Exec => tk.MustExec

hawkingrei · 2021-12-11T14:56:33Z

You should migrate all the test cases in the serial_test.go to testify. Please not move this case to other files. The new framework has no concept of test suite.

You can move this var _ = Suite(&testIntegrationSuite7{&testIntegrationSuite{}}) to ddl/db_integration_test.go. But do not move other things.

wangggong · 2021-12-11T15:25:49Z

You should migrate all the test cases in the serial_test.go to testify. Please not move this case to other files. The new framework has no concept of test suite.

You can move this var _ = Suite(&testIntegrationSuite7{&testIntegrationSuite{}}) to ddl/db_integration_test.go. But do not move other things.

Well, some test cases in serial_test.go belongs to other test suites (e.g., testIntegrationSuite7, testSerialDBSuite); while in these test suites not all test cases in serial_test.go. I'm not sure whether I need modify all cases in these test suites, or just keep them not modified, or just modify the cases in the file (and cases in other files will not be modified)...

wangggong · 2021-12-19T09:28:43Z

@tisonkun PTAL

PS: for TestRecoverTableByJobIDFail & TestRecoverTableByTableNameFail, test with add hook may cause failure. Then it is temporarily commented, and maybe I need some help to deal with it.

NOTE: TestRecoverTableByJobIDFail & TestRecoverTableByTableNameFail has fixed. Thus all testcases are available. PTAL

sre-bot · 2021-12-19T10:31:30Z

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/b6cc15dce8e8de2ac55ad180ea00e5e0cc8df45f

wangggong · 2022-01-04T13:43:07Z

@hawkingrei PTAL

tisonkun · 2022-02-19T05:13:16Z

@wangggong sorry to reply late. @hawkingrei and other did some works on decoupling ddl tests. Could you rebase the migrate on the nightly master? I'll review the PR then.

wangggong · 2022-03-01T02:31:00Z

@wangggong sorry to reply late. @hawkingrei and other did some works on decoupling ddl tests. Could you rebase the migrate on the nightly master? I'll review the PR then.

@tisonkun Sorry for replying late, I've merged. PTAL

hawkingrei · 2022-03-01T02:30:47Z

ddl/db_test.go

@@ -258,6 +257,16 @@ func testGetTableByName(c *C, ctx sessionctx.Context, db, table string) table.Ta
 	return tbl
 }

+func testGetTableByNameT(t *testing.T, ctx sessionctx.Context, db, table string) table.Table {


use tk.GetTableByName.

tisonkun · 2022-03-01T10:42:16Z

@wangggong thanks for your update. Let me try to submit follow ups...

tisonkun · 2022-03-01T10:43:26Z

testkit/testkit.go

@@ -62,6 +62,14 @@ func NewTestKit(t testing.TB, store kv.Storage) *TestKit {
 	}
 }

+// NewTestKitWithInit returns a new *TestKit and creates a session.
+func NewTestKitWithInit(t testing.TB, store kv.Storage) *TestKit {


We just simply write:

tk := NewTestKit(t, store) tk.MustExec("use test")

This method is too easy to misuse unnecessarily.

tisonkun · 2022-03-01T11:08:14Z

@wangggong @hawkingrei maybe you can cooperate on migrating this test & db_partition test, I found they're tightly coupled.

hawkingrei · 2022-03-03T05:57:55Z

/run-unit-test

Signed-off-by: tison <wander4096@gmail.com>

tisonkun · 2022-03-03T07:51:22Z

/merge

ti-chi-bot · 2022-03-03T07:51:25Z

This pull request has been accepted and is ready to merge.

Commit hash: 53bb6a3

hawkingrei · 2022-03-03T08:16:57Z

/run-unit-test

tisonkun · 2022-03-03T09:45:12Z

/run-unit-test

tisonkun · 2022-03-03T10:12:29Z

/run-unit-test

tisonkun · 2022-03-03T10:42:08Z

/run-unit-test

ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 10, 2021

hawkingrei reviewed Dec 10, 2021

View reviewed changes

ddl/db_integration_test.go Outdated Show resolved Hide resolved

hawkingrei reviewed Dec 10, 2021

View reviewed changes

ddl/serial_test.go Show resolved Hide resolved

hawkingrei reviewed Dec 10, 2021

View reviewed changes

ddl/db_test.go Show resolved Hide resolved

hawkingrei reviewed Dec 11, 2021

View reviewed changes

ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Dec 31, 2021

ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 8, 2022

wangggong requested a review from a team as a code owner January 24, 2022 02:22

ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 24, 2022

ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 1, 2022

hawkingrei reviewed Mar 1, 2022

View reviewed changes

tisonkun reviewed Mar 1, 2022

View reviewed changes

tisonkun closed this Mar 1, 2022

tisonkun reopened this Mar 1, 2022

tisonkun removed the request for review from a team March 1, 2022 10:44

tisonkun added 5 commits March 3, 2022 14:08

ddl: split testIntegrationSuite7 to another file

6350fbc

Signed-off-by: tison <wander4096@gmail.com>

ddl: migrate test-infra to testify for serial_test.go

a849c5e

Signed-off-by: tison <wander4096@gmail.com>

get rid of suite

0affeb7

Signed-off-by: tison <wander4096@gmail.com>

fix global configs

5efc33c

Signed-off-by: tison <wander4096@gmail.com>

_, err = Exec => err = ExecToErr

53bb6a3

Signed-off-by: tison <wander4096@gmail.com>

tisonkun force-pushed the testify branch from 5fc0749 to 53bb6a3 Compare March 3, 2022 07:34

tisonkun changed the title ~~testify: migrate test-infra to testify for ddl/serial_test.go~~ ddl: migrate test-infra to testify for serial_test.go Mar 3, 2022

tisonkun approved these changes Mar 3, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 3, 2022

hawkingrei approved these changes Mar 3, 2022

View reviewed changes

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 3, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 3, 2022

Merge branch 'master' into testify

c116bd6

Merge branch 'master' into testify

bfecedc

Merge branch 'master' into testify

b6cc15d

ti-chi-bot merged commit fb1066e into pingcap:master Mar 3, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ddl: migrate test-infra to testify for serial_test.go #30630

ddl: migrate test-infra to testify for serial_test.go #30630

wangggong commented Dec 10, 2021 •

edited by tisonkun

Loading

ti-chi-bot commented Dec 10, 2021 •

edited

Loading

wangggong commented Dec 10, 2021

hawkingrei Dec 11, 2021

hawkingrei commented Dec 11, 2021

wangggong commented Dec 11, 2021

wangggong commented Dec 19, 2021

sre-bot commented Dec 19, 2021 •

edited

Loading

wangggong commented Jan 4, 2022

tisonkun commented Feb 19, 2022

wangggong commented Mar 1, 2022

hawkingrei Mar 1, 2022

tisonkun commented Mar 1, 2022

tisonkun Mar 1, 2022

tisonkun commented Mar 1, 2022

hawkingrei commented Mar 3, 2022

tisonkun commented Mar 3, 2022

ti-chi-bot commented Mar 3, 2022

hawkingrei commented Mar 3, 2022

tisonkun commented Mar 3, 2022

tisonkun commented Mar 3, 2022

tisonkun commented Mar 3, 2022

ddl: migrate test-infra to testify for serial_test.go #30630

ddl: migrate test-infra to testify for serial_test.go #30630

Conversation

wangggong commented Dec 10, 2021 • edited by tisonkun Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Dec 10, 2021 • edited Loading

wangggong commented Dec 10, 2021

hawkingrei Dec 11, 2021

Choose a reason for hiding this comment

hawkingrei commented Dec 11, 2021

wangggong commented Dec 11, 2021

wangggong commented Dec 19, 2021

sre-bot commented Dec 19, 2021 • edited Loading

wangggong commented Jan 4, 2022

tisonkun commented Feb 19, 2022

wangggong commented Mar 1, 2022

hawkingrei Mar 1, 2022

Choose a reason for hiding this comment

tisonkun commented Mar 1, 2022

tisonkun Mar 1, 2022

Choose a reason for hiding this comment

tisonkun commented Mar 1, 2022

hawkingrei commented Mar 3, 2022

tisonkun commented Mar 3, 2022

ti-chi-bot commented Mar 3, 2022

hawkingrei commented Mar 3, 2022

tisonkun commented Mar 3, 2022

tisonkun commented Mar 3, 2022

tisonkun commented Mar 3, 2022

wangggong commented Dec 10, 2021 •

edited by tisonkun

Loading

ti-chi-bot commented Dec 10, 2021 •

edited

Loading

sre-bot commented Dec 19, 2021 •

edited

Loading